From f02dda595d9db7430e9db6753199ed530464139f Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 20 Jan 2003 02:46:33 +0000 Subject: [PATCH] Warning cleanup. Bump internal version # for popp beta. --- gpsbabel/Makefile | 4 ++-- gpsbabel/mapsend.c | 3 ++- gpsbabel/mkshort.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile index 94b823b26..ff7fb391a 100644 --- a/gpsbabel/Makefile +++ b/gpsbabel/Makefile @@ -35,8 +35,8 @@ dep: make clean && make CC="gcc -MMD" && cat *.d */*.d > /tmp/dep echo Edit Makefile and bring in /tmp/dep -VERSIONU=1_1_1_beta01172003 -VERSIOND=1.1.1_beta01172003 +VERSIONU=1_1_1_beta01192003 +VERSIOND=1.1.1_beta01192003 release: rm -fr gpsbabel-$(VERSIOND) cvs tag gpsbabel_$(VERSIONU) diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c index b0e9a774f..0ced00cd4 100644 --- a/gpsbabel/mapsend.c +++ b/gpsbabel/mapsend.c @@ -23,6 +23,7 @@ #include "defs.h" #include "mapsend.h" +#include "magellan.h" static FILE *mapsend_file_in; static FILE *mapsend_file_out; @@ -317,7 +318,7 @@ mapsend_waypt_pr(const waypoint *waypointp) double flong; double flat; static int cnt = 0; - char *iconp; + const char *iconp; const char *sn = global_opts.synthesize_shortnames ? mkshort(mkshort_handle, waypointp->description) : waypointp->shortname; diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c index dc77471cf..958b52bb2 100644 --- a/gpsbabel/mkshort.c +++ b/gpsbabel/mkshort.c @@ -103,7 +103,7 @@ mkshort_del_handle(void *h) for (i = 0; i < PRIME; i++) { queue *e, *t, *z; QUEUE_FOR_EACH(&hdr->namelist[i], e, t) { - uniq_shortname *s = e; + uniq_shortname *s = (uniq_shortname *) e; dequeue(e); free(s->orig_shortname); free(s); -- 2.30.2